correction comments
refactoring registry services