Debugger source code clean-up