CRM-12378 : code improvisation WRT https://github.com/civicrm/civicrm-core/pull/720#issuecomment-17823921https://github.com/civicrm/civicrm-core/pull/720#issuecomment-17823921 comment