Simplify diff to ease review