Mostly jshint modifications