Refactor boozeometer