Clean this up a bit [IMMUTANT-292]