refactoring of the whole message done