Code Cleanup

Various Code Cleanup