Improved 99 bottles of beer