VE-1145: Code review feedback