neutron flake8 fixes