Minor Clean ups
Code Cleanup