[cyb-59] changes according to PR comments