cleanup messages to match std more closely