pep8 compliance
Massive formatting edits.
formatting edits
minor name resolution fix