More complete anonymizing in data_format; slight refactor