Some minor tweaks & tidying up.
6 files changed