Tweaks to routes and reindent