Small refactor and tidy of routes