*edit debug info
*small refactoring