New formatter + organize import