message refactor
refactor message