some tidying up
Merge pull request #62 from LandRegistry/nd_refactor

some tidying up