[Debugger] code cleanup