tidied up the messaging a little bit