PEP8 and punctuation cleanup