Code Clean Up

fixed a few warnings