Improved and cleaned bib refs