[v0.3.2a] Cleanup Main.java