Mostly just reformatting files