tidy cobbler.spec somewhat