Refactoring init