Reformat/optimize imports