Cleanup and pep257 changes