White space and formatting fixes.