Minor Cleanup

Cleanup