PEP 8 clean up
Simplify tests and tweak prose.