Added jshint test, remove extra wrappers from source files