Use the ImmutableMap
Formatting tweak
Use the new config values