Clean up and improve package.json file