PEP8 and other style fixes.
Merge pull request #11 from Renelvon/pep8

PEP8 and other style fixes.