Clean this up a bit [IMMUTANT-292]
Clean this up a bit [IMMUTANT-292]

immutant/immutant,coopsource/immutant,kbaribeau/immutant,kbaribeau/immutant,coopsource/immutant,immutant/immutant,kbaribeau/immutant,coopsource/immutant,immutant/immutant,immutant/immutant