more tidying up on receiver.rb