PEP257 cleanup