Tidy up the provider slightly