Minor Code Cleanup 

Minor Code Cleanup