Cleaning up after jshint recommendations