route refactored