cleaner formatMessage() for #18