simplifying a bit, caught some typos