sweeper optimization
fix pep8 complains