A little of refactoring.