Further improve message