VE-518: Code review