Style tweak and dropping check that provider id is present