refactor expression
update message