Made everything as PEP8-compliant as is reasonable