Source Code cleanup

Removed compilation warnings.