Cleaned up MainActivity.java