tidied up messages