CRM-12910 - Additonal tweaks/formatting