Initial formatting pass through Services and Plugins.