Cleanup and remove some warnings in Eclipse