Fixed comments and flake8