Refactor
Refactor
Refactor
Add the name of player on message