* Simplify expressions early on

* fixed lint errors