merge fixes.  pep8 compliance.  remove of unnecessary vars