Quick refactor of the routes

Trying to clean up a few things to make it look more mo-factor