Refactored bottles-of-beer