Fix flake8 warnings
Fix whitespace and line length issues