Introduce a typedef for the IDToValue type
Fix formatting