simplified code

Change-Id: I59fee331a7b1ed34e062ab64045e631009b16542