config: Fix flake8 warnings
main: Remove resolved TODO