More PEP8 Compliance