oo changes
Code Cleanup