Lots of editing (removing ellipses and some rewording)