cleanup, jshint fixes