fix some format issue