Add formatting, minor tweaks