some refactoring of steps
Merge pull request #23 from LandRegistry/nd_refactor_marriage

some refactoring of steps