More PEP8 tidying.