Style and formatting fixes.