Small formatting tweaks to code