Remove redundant code in Dealer's loop. Make minor layout changes