Simplifications and published new version to NPM