addressed comments

Change-Id: I7c17441ac2ad51b8845731851fe2641ab7a0d57c