There are several PEP 8 violations, and not just in code I changed. This might be a good time for me to fix them.