Implemented your brush up of the paragraphs but stuck to the factory class still.