more structure changes, reducing nesting
Merge branch 'master' of https://github.com/CondeNast/pangea