Random edits to get in line with PEP.