More PEP8 and Comments