Fixed code review.

@yarondbb please review, if all ok, please merge and delete the merge branch (so that we will not have to much branches).