refactor et logger