[Debugger] simplified some code