More reformatting on part 1