Minor Cleanup
Minor Cleanup