Code clean up ... removed some warnings