Some cleanup in ClaimDiffer

Change-Id: Ieb255d32ef2af57cb6af52dc824faae0e045c433
Merge "Some cleanup in ClaimDiffer"