[TASK] Style improvements