implement suggested changes

Change-Id: I0a8b9793b4c577089381d752658bb8bba5658afa