Formatting tweaks to code