A touch of refactoring and preparing to flesh out smarter routes