VE-1686: Code review feedback