Fix reformat issues