Refactoring actors