Minor indentation changes.
Still fiddling.