Refactor some code (drink detail)