Reformat, organize imports