f3dd54e70f
Move most of the logic to LoadDescriptorUtil and refactor to avoid duplication. More descriptive names for LoadDescriptorUtil methods. Minor code improvements.