Refactored route for readability