Removed unnecessary class
Renamed SweepThread -> SweepAction
Organize imports