minor features
simplified Expr