Refactor beer-song