Simplified all auditing code