jshint-fixes, route-in-progress, fixes
beautify