simplifying a bit

Change-Id: I6dd0c47646269bfa7b84441bffa535cff5d0aa6e