[TASK] Fix CGL violations