Changes based on flake8 info