Refactored mapping from BibTeX to CSL