Application.java refactored
Application.java refactored with doc