PEP8, and addressing comments in example.