Fixed all compiler warnings
Cleanup
Cleanup