PEP8 and Single Line Style Compliance

Tried to make the code more compliant with PEP8
(i.e. 79 column max) and single line style, by continuing
lines with commas at the front. Then arguments can be
altered or removed without affecting neighboring lines, making
it easier to track changes.