Code review feedback
Merge pull request #797 from Metaswitch/sto940

[No reviewer required] sto940 code review feedback