@3360 - PEP8 improvements.
Merge pull request #1 from swierol/bug_3358

Bug 3358