More reformatting work.