Tidy up of package-info