modify the expressions

Change-Id: I40a94119e2bb5caa3200d854f7eab4561c932348