Code review refactor for DC aware local CL setting