Smaller changes in App.java