Refactor *sweeps*