reorder imports for a cleaner diff