claim / unclaim + refactoring.