Correct PEP8 issues
Remove unused import
Merge pull request #1 from bitrut/bug_1736

Bug 1736