Make some refactoring.