Partial cleanup of jshint errors