A bit more cleanup, and the routes controller