Mostly PEP8 compliance.