Properly re-ordered imports