Formatting tweaks
More formatting