Cosmetic code fixes