Refactor init methods