Fix required payment fields CRM-12149
Code cleanup and php strict fix