Add missing __init__() call
Minor refactoring