fixes, cleaning, flake8