Minor changes
Minor cleanup