Minor tweaks for style and readability.