Small refactoring in Messages
Updated comments