refactor ConnectionActor