global refactoring, dubug logger added