[CLEANUP] Cosmetic code-style changes