Import cleanup, PEP 8 compatible
Merge pull request #215 from Winnetou/patch-14

Import cleanup, PEP 8 compatible