Makes changes to handle cases where claim exists
Adds comments and removes some unnecessary stuff