Formatting changes after s/plugin/provider