More reformatted