Tidying up the source a little.
22 files changed