Code Cleanup. And Minor Updates