Start refactoring of debug information