Fix a flake8 error, remove assignment to variable
Fix an off by one error