Moving to a different format for ease of diffing/reading