Consistency and formatting tweaks.