fixed for CRM-12478 and also did code clean up and fixed formatting

----------------------------------------
* CRM-12478: Default for Financial Account should be per Financial Account Type
  http://issues.civicrm.org/jira/browse/CRM-12478