Improve code style aka PEP8
Merge pull request #576 from elyezer/pep8-improvements

Improve code style aka PEP8