Add cleaner and fix sweeper