[TASK] CGL - No spaces and add return