Tidy up manifest.yml