Minor tweaks (some indentation).