Tried to make the raffle query a little more readable and performant