Initializer refactoring