Fixed npm package name
Code cleanup