Uping npm version
Clean up & Comments