reorganized and fixed grammar