modified some format issue