[TASK] Small code cleanup