Make the message output a bit better