Refactor Callables