Refactor of application.