Cleaned up the ShoppingMaul code a bit