Minor code tidies
Minor code tidies

TrimBiggs/calico,anortef/calico,Metaswitch/calico,TrimBiggs/calico,neiljerram/felix,neiljerram/felix,neiljerram/felix,neiljerram/felix,kasisnu/calico,matthewdupre/felix,Metaswitch/calico,kasisnu/calico,ocadotechnology/calico,matthewdupre/felix,beddari/calico,alexhersh/calico,alexhersh/calico,ocadotechnology/calico,anortef/calico,beddari/calico