Tiny tweaks for PEP 8 compliance (mostly)