Clean up MUTEX solution a little bit