Improve message a bit