Code reviewed and ready for NPM