Small refactoring on Receiver