Minor cleanup
Minor cleanup