GUI-1266: Move a few comments to method docstrings.  Misc PEP8 cleanup