Merge "Refactor code smell AbstractValidatingChampGraph"