formats mapping, and removes first two levels, was erroring out
Merge pull request #471 from konklone/mapping

Formats mapping and removes first two levels