init refactoring