A lot more cleanup. Fix bug in Str method of partial remove sites.
More cleanup.
Pep8 cleanup.
Yet more PEP8 cleanup.