Some minor tweaks of layout/format