Clean up jshint violations a bit