little stop task refactoring