Formatting tweaks. Cuddle all braces!