Changed npm name and tidied code