audit refactors