Improve investigation.
Some tidying up.