Refactor to App.java