Add comments; PEP compliance