Reformat/optimized imports