Small refactorings
Auto worker cleanup, small refactorings
Small refactorings, improve worker cleanup