improve the format again