Update the factory references.
Auto reformat code.