Initialization refactoring