Automatic and manual PEP8 fixes, excluding E501: Line length for #101
PEP8 line length corrections