Code cleanup

Cleanup due to compiler warnings