LUN-1608: minor code refactor