Swapped deck and waste piles.
More code clean-up.