Cleanup enhancement

Cleanup enhancement