Code cleanup and package.json