+ more formatting tweaks