Refactor initializations