Clean some format issue