Move diff into utils