Changing formatter manager to not be a singleton and cleaning up legacy code a little.