Tweaks and indenting.