(refactor) Move message into message conditional