Cleanup of bib, towards auto-parsing