Address outstanding TODOs following code review
Address outstanding TODOs following code review
Merge pull request #44 from Metaswitch/address_todos

[No review required] Address code review feedback to address outstanding TODOs.