CF #28 - Comment and PEP