Extracting ActivitySweeper to separate file