WIP: Reducing code complexity - Mamertes::Application