PEP8 formatting and whitespace adjustments