Fix import order according to new version of flake8