Refactor VineCell