further  cleanup and PEP8 format cleanup.