Fixed some format issue