Properly commented the messages