BibAudit: Code Refactor

* See diff for changes