Shorten claim process

Resolves #3.