Code cleanup by Eclipse