cleanup and fix jshint