cleaning up the code. fixing the compiler warnings.
Fixec confilict