[TASK] Minor cleanups

Cosmetic fixes