Continued style and formatting tweaks.