fix typo
Optimize expressions.