Updated some message formatting