Minor Cleanup done