Initialization refactor