Made my changes more pep8 compliant

Wanted to have a look at how bad I did, so I fixed most of the pep8 issues. Didn't fix the line-length ones though.