Reducing duplication of messages

Appeasing codeclimate.com