Trimming the fat in the Drinking component.
Merge remote-tracking branch 'origin/master'