Tidys up the message and code style