Reformatted for PEP-0008