Refactor Accumulator