Refactor actor