jshint & style fixes