More PEP8 compliance