Minor Cleanup

Minor Cleanup