Nurl refactoring and clean up