Major cleanup of bibliography