Refactor bottles.