little cleanup on messages