Completed a little refactoring around routes