Route refactoring