Clean comments,  formatting and package.json mods