Typos fixes, more simplified grammar