More refactoring of init/state management