fmt and import fixup