Further code tidy up
25 files changed