Cleanup
Minor cleanup