[TASK] Code cleanup

Mostly cosmetics and CGL