Small rewrite and fixed typos