more tidying up to incorporate pull request 63