Clarify and cleanup messages