Minor tweak for auditor perf, and some code clean up
6 files changed