Refactor initializers to set important information early

* Clean up code formatting