small changes to import order