code cleanup by Eclipse