Cleaned up for NPM