fix naming and move __init__