Updated to comply with the sane parts of PEP 8.