HV-783 Extracting logic dealing with class hierarchies into dedicated class ClassHierarchyHelper
HV-783 formatting - indentation was wrong