Reformat and organize imports