Add __init__
Remove header comments