Claim task, some refactoring