First round of cleaning for the main.java