improve the format