Made some more edits following NY's suggestions.