Fix pep8 failures, and apply black formatting where applicable. (#788)

Fix pep8 failures, and apply black formatting where applicable. (#788) #347