Minor cleanup
Minor cleanup2