addressed review comments

Change-Id: I4e270b70462bd04f575cc43ea9c5e53169a50fb7