Refactor claim & finalize for readability #11

Closed anna-carroll closed 3 years ago