Route fixes, style tweaks, refactoring
2014