[Debugger] code simplification