various reformats across files