improve expression

Change-Id: I681efa9b327cd671f900c90684218e932db2ef95