jshint and cleanup.