Did some cleanup and PEP8 format cleanup.
Did some cleanup and PEP8 format cleanup.