Continue refactoring init