[TASK] Minor cleanup