some noice refacotring of message