clean hierarchy_interpreter.cpp a bit