More Code Cleanup
Additional Code Cleanup