jshint and cleanup