Refactoring scrubber to use existing xAxis