Tidying, removing unnecessary thread fork/joins