simplify messages a bit