VE-847: Code review changes