Withdraw audit refactor