Too many changes to enumerate, really
normalize formatting