(#2) Import order cleanup