Refactoring on the application class.