Clean up import ordering