comments and cleanups for messages