[TASK] Adhere coding guidelines