minor formatting tweaks all around