addressed code review comments

Change-Id: I688778bdcbd547904ca7ec848dc8dcb76b94f9e2