Minor cleaning of Main.java