minor code tidyups
minor code tidyups
Merge branch 'master' of https://github.com/ColumPaget/ParanoidTelentD

No idea how things got into a mess