"Properly" clean up threads
Query for names once instead of looping