Refactor QuartzVO