Minor whitespace and linebreak adjustments for PEP8