Refactor ConnectionReceiver