pep257 cleanup