Revert "650 PEP8 code style fixes"
Merge pull request #675 from echel0n/revert-659-nightly

Revert "650 PEP8 code style fixes"