Implemented some small changes to reduce the warnings shown by Eclipse.