ENH: clean-up and improvement of beer demo