Refactor init

milestone4