updated comments, less lines for getting messages [MJ-621]