CRM-12595 - Fix basic formatting problems