Formatting fixes, and some clean up.