Improve pep8 compliance

I'm not going to care about line length though, so it's still not
fully compliant.