Some misc late night route refactoring