Code Improvements

Code Improvements