Reformulations and typos
Fixed merge-conflict
Reformulation