Minor refactoring of Debugging module