Pep8 Fixes

Just a few pep8 fixes performed using autopep8 + manual string formatting. Unit tests pass.