Final cleanup of jshint errors