Modify some general format issue