simplify grammar
simplify grammar more