[FOLD] mutex cleanups
[FOLD] rearrangement