small refactor to cancelation token usage