try to improve message formatting