Route refactoring - tests passing