refactor for threading

needless, no?