Routes - some refactoring