Other fixes
Code Cleanup