Improve the API of the BeerSong exercise