Refactored: more space, ApplicationRoute, tab to space