Fixed race condition in IDESolver and simplified the code
minor cleanups