More init refactoring