Fix memory leak/have more consistent style
Merge pull request #170 from Metaswitch/rf_acct_id

[No review] Fix memory leak/have more consistent style