Reformat and optimize imports