Revert "[refactor]: use an executor class instead of closure (#375)"

Revert "[refactor]: use an executor class instead of closure (#375)" #607