More refactoring in Application.php. Whoop!