Refactoring, trying to include bibtex