Code tidying.
5 files changed