Refactored ThreadsRun a bit