fix some of the format issue