Adhering (more) to PEP 8