Modification to remove warnings raise by Eclipse