CRM-12926-improvement : some improvement after reading totten's comment on PR #1362

Improvements after reading https://github.com/civicrm/civicrm-core/pull/1362#discussion-diff-5637536 discussion