Refactoring to make more testable and not block
Simplified actors