Refactor some code (liquour detail)