UPD: #1225 for CommentModule + small fix PSR