Code changes by Eclipse