Code cleanup and updated cloudflash version in package.json