audit refactor