[TASK] Coding guideline cleanups