Refactored, unnested routes