Refactored bibliography.