PEP8 and typo cleanup