Grammar flow and syntax fix