Merge pull request #879 from nla/dsc-807-ingest

Dsc 807 ingest
code tidy up.
Merge remote-tracking branch 'origin/master' into dsc-807-ingest