routes refactoring 2