some grammar reorganization