refactoring actors