[TASK] Code guidelines cleanup