issue-118: code review changes