Fix PEP8 Formatting errors
Merge branch 'fix_pep8'