Further simplification and refactoring of WebApp into Route