neaten up for customizepkg-git