Reformat/Optimize imports