Fixing last few jshint warnings. A few acceptable ones left