Cleanup and flake8ing