Refactor clear message

See esl/wombat#784