Minor cleanup
Minor cleanup again