Improvemnets to formatting.