Code modernization

Replaced all instances of % formatting with str.format. Also ran resulting code through a barrage of pep8 compliance fixes. Mostly code aesthetic changes.
Why the `2` suffix on these?