Fix formatting on changed files
Add back in mistakenly removed lines