Small routes refactoring