Make some refactoring with Eclipse