diff --git a/src/main/java/net/vhati/modmanager/ui/ManagerFrame.java b/src/main/java/net/vhati/modmanager/ui/ManagerFrame.java
index d396a42..12524ef 100644
--- a/src/main/java/net/vhati/modmanager/ui/ManagerFrame.java
+++ b/src/main/java/net/vhati/modmanager/ui/ManagerFrame.java
@@ -501,10 +501,10 @@ public class ManagerFrame extends JFrame implements ActionListener, ModsScanObse
 
 
 	private void saveModOrder( List<ModFileInfo> sortedMods ) {
-		FileOutputStream os = null;
+		BufferedWriter bw = null;
 		try {
-			os = new FileOutputStream( modorderFile );
-			BufferedWriter bw = new BufferedWriter(new OutputStreamWriter( os, Charset.forName("UTF-8") ));
+			FileOutputStream os = new FileOutputStream( modorderFile );
+			bw = new BufferedWriter(new OutputStreamWriter( os, Charset.forName("UTF-8") ));
 
 			for ( ModFileInfo modFileInfo : sortedMods ) {
 				bw.write( modFileInfo.getName() );
@@ -516,7 +516,7 @@ public class ManagerFrame extends JFrame implements ActionListener, ModsScanObse
 			log.error( String.format( "Error writing \"%s\".", modorderFile.getName() ), e );
 		}
 		finally {
-			try {if (os != null) os.close();}
+			try {if (bw != null) bw.close();}
 			catch (Exception e) {}
 		}
 	}
diff --git a/src/main/java/net/vhati/modmanager/ui/ManagerInitThread.java b/src/main/java/net/vhati/modmanager/ui/ManagerInitThread.java
index 66b1410..5974af0 100644
--- a/src/main/java/net/vhati/modmanager/ui/ManagerInitThread.java
+++ b/src/main/java/net/vhati/modmanager/ui/ManagerInitThread.java
@@ -170,10 +170,10 @@ public class ManagerInitThread extends Thread {
 	private List<String> loadModOrder() {
 		List<String> result = new ArrayList<String>();
 
-		FileInputStream is = null;
+		BufferedReader br = null;
 		try {
-			is = new FileInputStream( modorderFile );
-			BufferedReader br = new BufferedReader(new InputStreamReader( is, Charset.forName("UTF-8") ));
+			FileInputStream is = new FileInputStream( modorderFile );
+			br = new BufferedReader(new InputStreamReader( is, Charset.forName("UTF-8") ));
 			String line;
 			while ( (line = br.readLine()) != null ) {
 				result.add( line );
@@ -185,7 +185,7 @@ public class ManagerInitThread extends Thread {
 			log.error( String.format( "Error reading \"%s\".", modorderFile.getName() ), e );
 		}
 		finally {
-			try {if ( is != null ) is.close();}
+			try {if ( br != null ) br.close();}
 			catch ( Exception e ) {}
 		}