some __init__ cleaning