Reducing duplication of messages

Appeasing code climate