formatting and color tweaks