Cosmetic code improvements