Formatting fixes
Adapt to cmip5 file naming, metadata convention