Cleaned up Main.java