More Minor cleanup