Refactored Application.