Small refactors
route