Tweaks to source formatting