Cosmetic changes to comply with PEP standards.