reformat + optimized imports