Tweaks to formatting