More minor modifications to the threading method

See title