[TASK] CGL Code Cleanup #44