Debug

Refactoring Debug.