Fix format, get rid of id properties and nonsensical names 1st draft