Committing Cleanup changes

Committing Cleanup changes