__init__ cleaned