More flake8 fixes
Use CFSD_PREFIX to remove redunanct string portion