VE-831 Code review cleanup