fixed whitespace and line length for improved PEP8 conformance

in an effort to be a good (if nit-picky) citizen

note that I did *not* alter the inline return statements because that seemed like potentially an intentional decision