Use Object.keys for mapped, map, each, ...
Renamed Property to Type and cleaned up.