refactoring client message