VE-768 Refactoring from code review