Refactor actors for simplification