code clean & urn management refactoring 1