Began refactoring bibliography