Routes refactored with helpers