improved Gfmt command