Reordering imports and a flake8 thing