Formatting tweaks

more cleanup