.init() refactor