READY: Refactor receiver out