Reorg. Standardize bibliography