#7 refactoring routes