Moved code to the scope where it is used.

Change-Id: I5af8e7cfca45b475d859e04ed448bf5793bf91fc
Reviewed-by: Orgad Shaneh <orgads@gmail.com>