Follow EranK code review