Minor tidying
Merge pull request #59 from ns-uw/master

Minor tidying