Minor Cleanup enhancements