* grammar change, cleanup