Cleaning up jshint issues