minor rearrange of imports