[TASK] Coding guidelines cleanup