Reduce complexity of Claims class
Merge pull request #91 from wmde/claims-complexity

Reduce complexity of Claims class