jshint-fixes + beautification