cleanup
refactor ConnectionActor