simplifying code

Change-Id: Id5f2dfe9cf4b96bc7c29f42700f5feaea16cb102