init: refactoring