pep8 conforming code

More pleasant code to read (especially on small screens). Tried to leave lines that won't make a lot of sense split as they are.

Just felt like contributing.