improve message
clean code
clean code