formatting fixes/tweaks