PEP8 Python Code Convention
Fixing bugs