Turn the FluxDispatcher into a class.
Fix up spacing in FluxDispatcher class.