Tidied up (or potentially broke) message formatting