convert default marshallers list to map for better readability

Code uses index 0, 1, 2, 3 of a list to mean specific things.. difficult to read and is brittle, changed to a map.