Small cleanup.
Use LiquidManager for Liquid Containers.
Take care of liquid in transit.