Refactor: remove init methods