[Debugger] Code simplification