More refactor auditlogger