Fix content functions
More flake8 fixes