[TASK] Fix CGL and minor cosmetics