Formatting tweaks to scripts (initial pass)