Dry up routing file
Merge pull request #1087 from romanblanco/dry_up_routes2

DRY up routing file