refactor some messages