Refactored BibFormatter class