Finish refactoring init