Clean-up import order