Cleaning up MainActivity.java