interim commit
refactoring of logging system