More flake8 cleanup with regard to visual indentation errors
flake8 cleanup for line too long errors