Some cosmetic code fixes