Cleaning and commenting in UI.java