work on review comments and code formating.
Removed white spaces

Change-Id: Ic54817bfc205be536ec086bdfd34b35b0eeac1a3
2 files changed