Some code clean-up in MainScreen.java