Fixed 'return' in __init__ and semicolons at end of statements