VE-1528: Code review