Slightly refactors Application.php to be more readable