Fix comments after Codereview
Change the Message design & naming according to discussion