Format cleanup
Slowly seperating out properties to be injected into a factory