Optimized import and reformat