small refactoring of Route