Attempt at fixing up IDAStar
Code cleanup