Minor: reordered imports