Refactoring the application.