Clean up Main.java