added some regexp rules to simplify expressions