Code and comment clean up for the Claim API.