Revert:improve expression

Change-Id: I681efa9b327cd671f900c90684218e932db2ef95 (reverted from commit 49ee56895c1983154eae34083adbef352830aff3)