tidy up
a gesture towards thread safety