KCINFR-979: code review comments