[TASK] Fix some cgl violations