refactoring debt related elements