improvements
removed Worker class