diff --git a/app/src/main/java/com/termux/filepicker/TermuxFilePickerActivity.java b/app/src/main/java/com/termux/filepicker/TermuxFilePickerActivity.java
index c09fae4f..aec358e6 100644
--- a/app/src/main/java/com/termux/filepicker/TermuxFilePickerActivity.java
+++ b/app/src/main/java/com/termux/filepicker/TermuxFilePickerActivity.java
@@ -36,7 +36,7 @@ public class TermuxFilePickerActivity extends ListActivity {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.file_picker);
 
-        mAdapter = new ArrayAdapter<String>(this, android.R.layout.simple_list_item_1, mFileNames);
+        mAdapter = new ArrayAdapter<>(this, android.R.layout.simple_list_item_1, mFileNames);
 
         enterDirectory(new File(TERMUX_HOME));
         setListAdapter(mAdapter);
diff --git a/app/src/test/java/com/termux/terminal/TerminalRowTest.java b/app/src/test/java/com/termux/terminal/TerminalRowTest.java
index 45d51262..4138aa19 100644
--- a/app/src/test/java/com/termux/terminal/TerminalRowTest.java
+++ b/app/src/test/java/com/termux/terminal/TerminalRowTest.java
@@ -377,9 +377,9 @@ public class TerminalRowTest extends TestCase {
 		// int[] expected = new int[] { TerminalEmulator.UNICODE_REPLACEMENT_CHAR, 'a', '8', 0x73EE, 0x009F, 0x881F, 0x8324, 0xD4C9, 0xFFFD,
 		// 'B', 0x009B, 0x61C9, 'Z' };
 		int currentColumn = 0;
-		for (int i = 0; i < points.length; i++) {
-			row.setChar(currentColumn, points[i], 0);
-			currentColumn += WcWidth.width(points[i]);
+		for (int point : points) {
+			row.setChar(currentColumn, point, 0);
+			currentColumn += WcWidth.width(point);
 		}
 		// assertLineStartsWith(points);
 		// assertEquals(Character.highSurrogate(0xC2541), line.mText[0]);