- remove a few other race condition opportunities and some code maintenance