Minor tidy up of provisioning code