Converted to PEP8
Converted to PEP8 + fixed