Some cosmetic cleanup