VE-1686: Feedback from code review