Move methods to base sweeper module