refactor(route): dry up and refactor code

DRY up the code a bit and remove a trailing CS comma
Merge pull request #408 from eddiemonge/refac

refactor(route): dry up and refactor code