Reformat some code to be more legible and consistent.