Fixed sweeper, refactoring