Refactor Enum and BeverageType