jshint fixes and cleanup