Cleaned up string variable substitution to the non-deprecated format.  Also tried to reign in pep8 line length violations.