Refactoring for actors.