Modified for PEP8 compliance
Shortened a few more lines
Merge pull request #1 from technoskald/pep8

Modified for PEP8 compliance