Quick refactor of the routes
Merge pull request #5 from rossbruniges/refactor

Quick refactor of the routes