Refactor stop()
Fix Scheduler Worker detection