Logging service refactoring