Cleanup grammar WIP