Added some updated code based reviewer comments,
simplified solver scheduler driver code.