Source cleanup by Eclipse Luna