Refactor code
Merge pull request #10 from LandRegistry/new_dev_env

Refactor code