misc formatting tweaks