Refactoring with Actor