Cleaned the main.java a bit up.