Cleanup code - flake8