audit: code clean up