Formatting cleanup
Changed ContextualProviders to be overridable