minimize diff for easier review