Formatting/minor fixes.