A clean up of the drinkpi code