Manual fixes to make it jshint compliant
Automatic fixes to make jshint compliant