Cosmetic code improvements.